From bdca6b33b8601efad6c3ba9ee767f91664479491 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 29 Jan 2004 23:26:45 +0000 Subject: [PATCH] Allow NULL for strings to clear the list. (#105386, Marco Pesenti Gritti) Fri Jan 30 00:13:46 2004 Matthias Clasen * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL for strings to clear the list. (#105386, Marco Pesenti Gritti) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ docs/reference/ChangeLog | 5 +++++ docs/reference/gtk/tmpl/gtkcombo.sgml | 2 +- gtk/gtkcombo.c | 4 ++-- 8 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b8d583eb7..dcc1c5e9f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 30 00:13:46 2004 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL + for strings to clear the list. (#105386, Marco Pesenti Gritti) + 2004-01-28 Richard Hult * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8b8d583eb7..dcc1c5e9f8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Jan 30 00:13:46 2004 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL + for strings to clear the list. (#105386, Marco Pesenti Gritti) + 2004-01-28 Richard Hult * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8b8d583eb7..dcc1c5e9f8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Jan 30 00:13:46 2004 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL + for strings to clear the list. (#105386, Marco Pesenti Gritti) + 2004-01-28 Richard Hult * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8b8d583eb7..dcc1c5e9f8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Jan 30 00:13:46 2004 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL + for strings to clear the list. (#105386, Marco Pesenti Gritti) + 2004-01-28 Richard Hult * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8b8d583eb7..dcc1c5e9f8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Jan 30 00:13:46 2004 Matthias Clasen + + * gtk/gtkcombo.c (gtk_combo_set_popdown_strings): Allow NULL + for strings to clear the list. (#105386, Marco Pesenti Gritti) + 2004-01-28 Richard Hult * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 1a31ba5151..f44827c86f 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 30 00:27:36 2004 Matthias Clasen + + * gtk/tmpl/gtkcombo.sgml: Document clearing the list with + gtk_combo_set_popdown_strings(). + Wed Jan 28 22:51:41 2004 Matthias Clasen * gtk/tmpl/gtktreeviewcolumn.sgml: Remove unfinished sentence, until diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml index d1436e337a..5263ac2d77 100644 --- a/docs/reference/gtk/tmpl/gtkcombo.sgml +++ b/docs/reference/gtk/tmpl/gtkcombo.sgml @@ -146,7 +146,7 @@ Convenience function to set all of the items in the popup list. @combo: a #GtkCombo. -@strings: a list of strings. +@strings: a list of strings, or %NULL to clear the popup list diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c index 9282473c4f..0fadeb9b61 100644 --- a/gtk/gtkcombo.c +++ b/gtk/gtkcombo.c @@ -1109,13 +1109,13 @@ gtk_combo_set_use_arrows_always (GtkCombo * combo, gboolean val) } void -gtk_combo_set_popdown_strings (GtkCombo * combo, GList * strings) +gtk_combo_set_popdown_strings (GtkCombo *combo, + GList *strings) { GList *list; GtkWidget *li; g_return_if_fail (GTK_IS_COMBO (combo)); - g_return_if_fail (strings != NULL); gtk_combo_popdown_list (combo); -- 2.30.2